Skip to content

refactor: remove duplicate inject#7548

Merged
yadvr merged 1 commit into
apache:mainfrom
shapeblue:fix-storagemanagerimpl-voldainject
May 26, 2023
Merged

refactor: remove duplicate inject#7548
yadvr merged 1 commit into
apache:mainfrom
shapeblue:fix-storagemanagerimpl-voldainject

Conversation

@shwstppr

@shwstppr shwstppr commented May 23, 2023 •
edited
Loading

Copy link
Copy Markdown
Contributor

Description

VolumeDao has been injected twice. This PR removes and refactors duplicate injection.

Types of changes

  • Breaking change (fix or feature that would cause existing functionality to change)
  • New feature (non-breaking change which adds functionality)
  • Bug fix (non-breaking change which fixes an issue)
  • Enhancement (improves an existing feature and functionality)
  • Cleanup (Code refactoring and cleanup, that may add test cases)

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

  • Major
  • Minor

Bug Severity

  • BLOCKER
  • Critical
  • Major
  • Minor
  • Trivial

Screenshots (if appropriate):

How Has This Been Tested?

@shwstppr
refactor: remove duplicate inject
68afd39 
VolumeDao has been injected twice. This PR removes and refactors injection.

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>
@codecov

codecov Bot commented May 23, 2023

Copy link
Copy Markdown

Codecov Report

Merging #7548 (68afd39) into main (1bd47d3) will decrease coverage by 0.01%.
The diff coverage is 0.00%.

@@             Coverage Diff              @@
##               main    #7548      +/-   ##
============================================
- Coverage     12.95%   12.95%   -0.01%     
+ Complexity     8988     8986       -2     
============================================
  Files          2728     2728              
  Lines        256647   256647              
  Branches      40024    40024              
============================================
- Hits          33259    33257       -2     
- Misses       219209   219211       +2     
  Partials       4179     4179
Impacted Files Coverage Δ
...ain/java/com/cloud/storage/StorageManagerImpl.java 0.89% <0.00%> (ø)

... and 4 files with indirect coverage changes

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

DaanHoogland
DaanHoogland approved these changes May 23, 2023
View reviewed changes

@DaanHoogland DaanHoogland left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

clgtm

@yadvr yadvr added this to the 4.19.0.0 milestone May 24, 2023
@DaanHoogland

DaanHoogland commented May 25, 2023

Copy link
Copy Markdown
Contributor

@blueorangutan package

@blueorangutan

blueorangutan commented May 25, 2023

Copy link
Copy Markdown

@DaanHoogland a [SF] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

@blueorangutan

blueorangutan commented May 25, 2023

Copy link
Copy Markdown

Packaging result [SF]: ✔️ el7 ✔️ el8 ✔️ el9 ✔️ debian ✔️ suse15. SL-JID 6146

@DaanHoogland

DaanHoogland commented May 25, 2023

Copy link
Copy Markdown
Contributor

@blueorangutan test

@blueorangutan

blueorangutan commented May 25, 2023

Copy link
Copy Markdown

@DaanHoogland a [SF] Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests

@blueorangutan

blueorangutan commented May 26, 2023

Copy link
Copy Markdown

[SF] Trillian test result (tid-6580)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 56524 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr7548-t6580-kvm-centos7.zip
Smoke tests completed. 109 look OK, 1 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test Result Time (s) Test File
test_02_upgrade_kubernetes_cluster Failure 497.79 test_kubernetes_clusters.py
test_08_upgrade_kubernetes_ha_cluster Error 4032.28 test_kubernetes_clusters.py
test_09_delete_kubernetes_ha_cluster Failure 0.04 test_kubernetes_clusters.py
ContextSuite context=TestKubernetesCluster>:teardown Error 3699.84 test_kubernetes_clusters.py

@yadvr

yadvr commented May 26, 2023

Copy link
Copy Markdown
Member

Failures due to env, tests lgtm

@yadvr yadvr merged commit 0c13024 into apache:main May 26, 2023
@yadvr yadvr deleted the fix-storagemanagerimpl-voldainject branch May 26, 2023 01:49
@vishesh92 vishesh92 mentioned this pull request Jun 7, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@yadvr yadvr yadvr approved these changes
@DaanHoogland DaanHoogland DaanHoogland approved these changes

Assignees

No one assigned

Labels

component:storage

Projects

None yet

Milestone

4.19.0.0

Development

Successfully merging this pull request may close these issues.

4 participants

@shwstppr @DaanHoogland @blueorangutan @yadvr